From: Keir Fraser Date: Mon, 4 Jul 2011 06:57:32 +0000 (+0100) Subject: x86: Couple of small cleanups after cpuid faulting patch. X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~10074 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=db39174bcdd7b14817a983c7d09bb8979b74abbd;p=xen.git x86: Couple of small cleanups after cpuid faulting patch. Signed-off-by: Keir Fraser --- diff --git a/xen/arch/x86/cpu/cpu.h b/xen/arch/x86/cpu/cpu.h index e4b0044983..a696859ff6 100644 --- a/xen/arch/x86/cpu/cpu.h +++ b/xen/arch/x86/cpu/cpu.h @@ -30,4 +30,3 @@ extern void display_cacheinfo(struct cpuinfo_x86 *c); extern void generic_identify(struct cpuinfo_x86 * c); extern void early_intel_workaround(struct cpuinfo_x86 *c); -extern void intel_cpuid_faulting_flip(unsigned int enable); diff --git a/xen/arch/x86/cpu/intel.c b/xen/arch/x86/cpu/intel.c index 3eb06b3d8f..e5878759cb 100644 --- a/xen/arch/x86/cpu/intel.c +++ b/xen/arch/x86/cpu/intel.c @@ -27,7 +27,7 @@ struct movsl_mask movsl_mask __read_mostly; static unsigned int probe_intel_cpuid_faulting(void) { - uint32_t x; + uint64_t x; return !rdmsr_safe(MSR_INTEL_PLATFORM_INFO, x) && (x & (1u<<31)); }